From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 16 Feb 2024 23:43:40 +0000 (+0100)
Subject: main: Remove unused parameters from pushModal()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2~1^2~157
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=96471b9d1948728358d0a2392a15bac136ac8afb;p=gnome-shell.git

main: Remove unused parameters from pushModal()

Both timestamp and options parameters have been unused since
the switch to Clutter.grab(), so remove them.

Stop using Params.parse(), so that code that still passes the
parameters doesn't throw an error.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3195>
---

diff --git a/js/ui/main.js b/js/ui/main.js
index 5e991aa66..a856c5695 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -26,7 +26,6 @@ import * as OsdMonitorLabeler from './osdMonitorLabeler.js';
 import * as Overview from './overview.js';
 import * as PadOsd from './padOsd.js';
 import * as Panel from './panel.js';
-import * as Params from '../misc/params.js';
 import * as RunDialog from './runDialog.js';
 import * as WelcomeDialog from './welcomeDialog.js';
 import * as Layout from './layout.js';
@@ -659,13 +658,6 @@ function _findModal(grab) {
  * which was focused at the time pushModal() was invoked.
  *
  * `params` may be used to provide the following parameters:
- *  - timestamp: used to associate the call with a specific user initiated
- *               event. If not provided then the value of
- *               global.get_current_time() is assumed.
- *
- *  - options: Meta.ModalOptions flags to indicate that the pointer is
- *             already grabbed
- *
  *  - actionMode: used to set the current Shell.ActionMode to filter
  *                global keybindings; the default of NONE will filter
  *                out all keybindings
@@ -674,12 +666,11 @@ function _findModal(grab) {
  * @param {object=} params - optional parameters
  * @returns {Clutter.Grab} - the grab handle created
  */
-export function pushModal(actor, params) {
-    params = Params.parse(params, {
-        timestamp: global.get_current_time(),
-        options: 0,
+export function pushModal(actor, params = {}) {
+    const {actionMode: newActionMode} = {
         actionMode: Shell.ActionMode.NONE,
-    });
+        ...params,
+    };
 
     let grab = global.stage.grab(actor);
 
@@ -713,7 +704,7 @@ export function pushModal(actor, params) {
         actionMode,
     });
 
-    actionMode = params.actionMode;
+    actionMode = newActionMode;
     global.stage.set_key_focus(actor);
     return grab;
 }